Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ipxe: fix build by fixing -idirafter ordering #213106

Merged
merged 1 commit into from
Jan 28, 2023
Merged

ipxe: fix build by fixing -idirafter ordering #213106

merged 1 commit into from
Jan 28, 2023

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jan 28, 2023 •
edited
Loading

ipxe build broke after #210004 where we started dropping default libc include path and switched to -idirafter way of specifying libc headers.

Unfortunately the way it's implemented it injects -idirafter after user's flags, not before. That allows users to inject their paths before libc include paths, not after (as it would notmally happen).

The change works it around for ipxe by pulling -idirafter libc flags before user's flags.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@trofi
ipxe: fix build by fixing -idirafter ordering
a9e6a5c 
`ipxe` build broke after NixOS#210004
where we started dropping default libc include path and switched to
`-idirafter` way of specifying libc headers.

Unfortunately the way it's implemented it injects `-idirafter` after
user's flags, not before. That allows users to inject their paths before
libc include paths, not after (as it would notmally happen).

The change works it around for `ipxe` by pulling `-idirafter` libc flags
before user's flags.
@trofi trofi mentioned this pull request Jan 28, 2023
Merged
13 tasks
@ofborg ofborg bot requested a review from ehmry January 28, 2023 08:36
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jan 28, 2023
@trofi
Copy link
Contributor Author

trofi commented Jan 28, 2023

Result of nixpkgs-review pr 213106 run on x86_64-linux 1

1 package built:
  • ipxe

@trofi trofi merged commit f123ea9 into NixOS:staging-next Jan 28, 2023
@trofi trofi deleted the ipxe-fix-idirafter branch January 28, 2023 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehmry ehmry Awaiting requested review from ehmry

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@trofi